projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cea3e3 22dcb3b)
bitkeeper revision 1.1159.1.109 (412e1015AWvg5PGCnYrXQ63XhU18YQ)
authorxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Thu, 26 Aug 2004 16:30:13 +0000 (16:30 +0000)
committerxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Thu, 26 Aug 2004 16:30:13 +0000 (16:30 +0000)
Merge http://xen.bkbits.net:8080/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/xeno-unstable.bk

1  2 
tools/python/xen/xend/server/blkif.py patch | diff1 | diff2 | blob | history
tools/python/xen/xend/server/netif.py patch | diff1 | diff2 | blob | history

diff --cc tools/python/xen/xend/server/blkif.py
Simple merge
diff --cc tools/python/xen/xend/server/netif.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.